From a667ee8e5ec04eb9c5cb5e5f3ad4735d920d883a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Wed, 21 Oct 2009 22:35:12 +0200 Subject: [PATCH] Use G_STRFUNC instead __FUNCTION__ --- gdk/directfb/gdkdrawable-directfb.c | 22 ++++++------ gdk/directfb/gdkevents-directfb.c | 2 +- gdk/directfb/gdkimage-directfb.c | 4 +-- gdk/directfb/gdkinput-directfb.c | 4 +-- gdk/directfb/gdkpixmap-directfb.c | 2 +- gdk/directfb/gdkwindow-directfb.c | 56 ++++++++++++++--------------- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c index e10f6b11ac..7e26c8d21b 100644 --- a/gdk/directfb/gdkdrawable-directfb.c +++ b/gdk/directfb/gdkdrawable-directfb.c @@ -160,7 +160,7 @@ gdk_directfb_set_colormap (GdkDrawable *drawable, impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p ) <- old %p\n", __FUNCTION__, drawable, colormap, impl->colormap ); + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p ) <- old %p\n", G_STRFUNC, drawable, colormap, impl->colormap ); if (impl->colormap == colormap) return; @@ -235,7 +235,7 @@ gdk_directfb_clip_region (GdkDrawable *drawable, g_return_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable)); g_return_if_fail (ret_clip != NULL); - D_DEBUG_AT( GDKDFB_DrawClip, "%s( %p, %p, %p )\n", __FUNCTION__, drawable, gc, draw_rect ); + D_DEBUG_AT( GDKDFB_DrawClip, "%s( %p, %p, %p )\n", G_STRFUNC, drawable, gc, draw_rect ); private = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); @@ -435,7 +435,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable, g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %4d,%4d - %4dx%4d )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %4d,%4d - %4dx%4d )\n", G_STRFUNC, drawable, gc, filled ? " filled" : "outline", x, y, width, height ); impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); @@ -593,7 +593,7 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable, { g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %p, %d )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %p, %d )\n", G_STRFUNC, drawable, gc, filled ? " filled" : "outline", points, npoints ); if (npoints < 3) @@ -704,7 +704,7 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable, DFBRectangle rect = { xsrc, ysrc, width, height }; gint i; - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC, drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height ); impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); @@ -749,7 +749,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable, DFBRegion region = { points->x, points->y, points->x, points->y }; - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", __FUNCTION__, drawable, gc, points, npoints ); + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC, drawable, gc, points, npoints ); if (npoints < 1) return; @@ -798,7 +798,7 @@ gdk_directfb_draw_segments (GdkDrawable *drawable, // DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 }; - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", __FUNCTION__, drawable, gc, segs, nsegs ); + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC, drawable, gc, segs, nsegs ); if (nsegs < 1) return; @@ -878,7 +878,7 @@ gdk_directfb_draw_lines (GdkDrawable *drawable, DFBRegion region = { points->x, points->y, points->x, points->y }; - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", __FUNCTION__, drawable, gc, points, npoints ); + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC, drawable, gc, points, npoints ); if (npoints < 2) return; @@ -953,7 +953,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable, g_return_if_fail (GDK_IS_DRAWABLE (drawable)); g_return_if_fail (image != NULL); - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC, drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height ); impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable); @@ -1202,7 +1202,7 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable, g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width); g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height); - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC, drawable, gc, pixbuf, src_x, src_y, dest_x, dest_y, width, height ); /* Clip to the drawable; this is required for get_from_drawable() so @@ -1494,7 +1494,7 @@ gdk_drawable_impl_directfb_finalize (GObject *object) GdkDrawableImplDirectFB *impl; impl = GDK_DRAWABLE_IMPL_DIRECTFB (object); - D_DEBUG_AT( GDKDFB_Drawable, "%s( %p ) <- %dx%d (%s at %4d,%4d)\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Drawable, "%s( %p ) <- %dx%d (%s at %4d,%4d)\n", G_STRFUNC, object, impl->width, impl->height, drawable_impl_type_name( object ), impl->abs_x, impl->abs_y ); diff --git a/gdk/directfb/gdkevents-directfb.c b/gdk/directfb/gdkevents-directfb.c index d04a6c5759..34d06b7f06 100644 --- a/gdk/directfb/gdkevents-directfb.c +++ b/gdk/directfb/gdkevents-directfb.c @@ -209,7 +209,7 @@ dfb_events_io_func (GIOChannel *channel, if (result == G_IO_STATUS_ERROR) { - g_warning ("%s: GIOError occured", __FUNCTION__); + g_warning ("%s: GIOError occured", G_STRFUNC); return TRUE; } diff --git a/gdk/directfb/gdkimage-directfb.c b/gdk/directfb/gdkimage-directfb.c index 7f73ca31e1..a6bee05050 100644 --- a/gdk/directfb/gdkimage-directfb.c +++ b/gdk/directfb/gdkimage-directfb.c @@ -151,7 +151,7 @@ gdk_image_new_bitmap (GdkVisual *visual, GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h)); - g_message ("not fully implemented %s", __FUNCTION__); + g_message ("not fully implemented %s", G_STRFUNC); image->bpl = (w + 7) / 8; image->mem = g_malloc (image->bpl * h); @@ -209,7 +209,7 @@ _gdk_image_new_for_depth (GdkScreen *screen, format = DSPF_ARGB; break; default: - g_message ("unimplemented %s for depth %d", __FUNCTION__, depth); + g_message ("unimplemented %s for depth %d", G_STRFUNC, depth); return NULL; } diff --git a/gdk/directfb/gdkinput-directfb.c b/gdk/directfb/gdkinput-directfb.c index 4c780a1439..9fbe3a63e6 100644 --- a/gdk/directfb/gdkinput-directfb.c +++ b/gdk/directfb/gdkinput-directfb.c @@ -228,7 +228,7 @@ gboolean gdk_device_set_mode (GdkDevice *device, GdkInputMode mode) { - g_message ("unimplemented %s", __FUNCTION__); + g_message ("unimplemented %s", G_STRFUNC); return FALSE; } @@ -303,7 +303,7 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask, GdkExtensionMode mode) { - g_message ("unimplemented %s", __FUNCTION__); + g_message ("unimplemented %s", G_STRFUNC); } GList * diff --git a/gdk/directfb/gdkpixmap-directfb.c b/gdk/directfb/gdkpixmap-directfb.c index b83755ae4c..7e45ba0afe 100644 --- a/gdk/directfb/gdkpixmap-directfb.c +++ b/gdk/directfb/gdkpixmap-directfb.c @@ -170,7 +170,7 @@ _gdk_pixmap_new (GdkDrawable *drawable, format = DSPF_RGB32; break; default: - g_message ("unimplemented %s for depth %d", __FUNCTION__, depth); + g_message ("unimplemented %s for depth %d", G_STRFUNC, depth); return NULL; } } diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index 1cc943ec62..61c9bace6a 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -185,7 +185,7 @@ gdk_window_impl_directfb_finalize (GObject *object) { GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (object); - D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %dx%d\n", __FUNCTION__, impl, impl->drawable.width, impl->drawable.height ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %dx%d\n", G_STRFUNC, impl, impl->drawable.width, impl->drawable.height ); if (GDK_WINDOW_IS_MAPPED (impl->drawable.wrapper)) gdk_window_hide (impl->drawable.wrapper); @@ -216,7 +216,7 @@ gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable) GdkRectangle rect = { 0, 0, 0, 0 }; DFBRectangle drect = { 0, 0, 0, 0 }; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, drawable ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, drawable ); if (priv->surface) priv->surface->GetVisibleRectangle (priv->surface, &drect); @@ -259,7 +259,7 @@ create_directfb_window (GdkWindowImplDirectFB *impl, DFBResult ret; IDirectFBWindow *window; - D_DEBUG_AT( GDKDFB_Window, "%s( %4dx%4d, caps 0x%08x )\n", __FUNCTION__, desc->width, desc->height, desc->caps ); + D_DEBUG_AT( GDKDFB_Window, "%s( %4dx%4d, caps 0x%08x )\n", G_STRFUNC, desc->width, desc->height, desc->caps ); ret = _gdk_display->layer->CreateWindow (_gdk_display->layer, desc, &window); @@ -370,7 +370,7 @@ gdk_directfb_window_new (GdkWindow *parent, g_return_val_if_fail (attributes != NULL, NULL); - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, parent ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, parent ); if (!parent || attributes->window_type != GDK_WINDOW_CHILD) parent = _gdk_parent_root; @@ -747,7 +747,7 @@ gdk_directfb_window_destroy (GdkWindow *window, g_return_if_fail (GDK_IS_WINDOW (window)); - D_DEBUG_AT( GDKDFB_Window, "%s( %p, %srecursing, %sforeign )\n", __FUNCTION__, window, + D_DEBUG_AT( GDKDFB_Window, "%s( %p, %srecursing, %sforeign )\n", G_STRFUNC, window, recursing ? "" : "not ", foreign_destroy ? "" : "no " ); private = GDK_WINDOW_OBJECT (window); @@ -789,7 +789,7 @@ gdk_window_destroy_notify (GdkWindow *window) { g_return_if_fail (GDK_IS_WINDOW (window)); - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); if (!GDK_WINDOW_DESTROYED (window)) { @@ -838,7 +838,7 @@ gdk_directfb_change_focus (GdkWindow *new_focus_window) GdkWindow *new_win; GdkWindow *event_win; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, new_focus_window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, new_focus_window ); /* No focus changes while the pointer is grabbed */ if (_gdk_directfb_pointer_grab_window) @@ -914,7 +914,7 @@ gdk_directfb_window_raise (GdkWindow *window) { GdkWindowObject *parent; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); parent = GDK_WINDOW_OBJECT (window)->parent; @@ -932,7 +932,7 @@ gdk_directfb_window_lower (GdkWindow *window) { GdkWindowObject *parent; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); parent = GDK_WINDOW_OBJECT (window)->parent; @@ -963,7 +963,7 @@ send_map_events (GdkWindowObject *private) if (!GDK_WINDOW_IS_MAPPED (private)) return; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, private ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, private ); event_win = gdk_directfb_other_event_window ((GdkWindow *) private, GDK_MAP); if (event_win) @@ -1006,7 +1006,7 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src, GdkWindow *b; GdkWindow *event_win; - D_DEBUG_AT( GDKDFB_Crossing, "%s( %p -> %p, %d )\n", __FUNCTION__, src, dest, mode ); + D_DEBUG_AT( GDKDFB_Crossing, "%s( %p -> %p, %d )\n", G_STRFUNC, src, dest, mode ); /* Do a possible cursor change before checking if we need to generate crossing events so cursor changes due to pointer @@ -1259,7 +1259,7 @@ show_window_internal (GdkWindow *window, GdkWindowImplDirectFB *impl; GdkWindow *mousewin; - D_DEBUG_AT( GDKDFB_Window, "%s( %p, %sraise )\n", __FUNCTION__, window, raise ? "" : "no " ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p, %sraise )\n", G_STRFUNC, window, raise ? "" : "no " ); private = GDK_WINDOW_OBJECT (window); impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); @@ -1303,7 +1303,7 @@ gdk_directfb_window_show (GdkWindow *window, { g_return_if_fail (GDK_IS_WINDOW (window)); - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); show_window_internal (window, raise); } @@ -1318,7 +1318,7 @@ gdk_directfb_window_hide (GdkWindow *window) g_return_if_fail (GDK_IS_WINDOW (window)); - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); private = GDK_WINDOW_OBJECT (window); impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); @@ -1671,7 +1671,7 @@ gdk_window_directfb_raise (GdkWindow *window) { GdkWindowImplDirectFB *impl; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); g_return_if_fail (GDK_IS_WINDOW (window)); @@ -1702,7 +1702,7 @@ gdk_window_directfb_lower (GdkWindow *window) { GdkWindowImplDirectFB *impl; - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); g_return_if_fail (GDK_IS_WINDOW (window)); @@ -1743,7 +1743,7 @@ gdk_window_set_hints (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; - D_DEBUG_AT( GDKDFB_Window, "%s( %p, %3d,%3d, min %4dx%4d, max %4dx%4d, flags 0x%08x )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Window, "%s( %p, %3d,%3d, min %4dx%4d, max %4dx%4d, flags 0x%08x )\n", G_STRFUNC, window, x,y, min_width, min_height, max_width, max_height, flags ); /* N/A */ } @@ -1770,9 +1770,9 @@ gdk_window_set_title (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; - D_DEBUG_AT( GDKDFB_Window, "%s( %p, '%s' )\n", __FUNCTION__, window, title ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p, '%s' )\n", G_STRFUNC, window, title ); /* N/A */ - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window ); } void @@ -1840,7 +1840,7 @@ gdk_directfb_window_set_background (GdkWindow *window, g_return_if_fail (color != NULL); - D_DEBUG_AT( GDKDFB_Window, "%s( %p, %d,%d,%d )\n", __FUNCTION__, window, color->red, color->green, color->blue ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p, %d,%d,%d )\n", G_STRFUNC, window, color->red, color->green, color->blue ); private = GDK_WINDOW_OBJECT (window); private->bg_color = *color; @@ -1861,7 +1861,7 @@ gdk_directfb_window_set_back_pixmap (GdkWindow *window, g_return_if_fail (GDK_IS_WINDOW (window)); - D_DEBUG_AT( GDKDFB_Window, "%s( %p, %p )\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Window, "%s( %p, %p )\n", G_STRFUNC, window, pixmap); private = GDK_WINDOW_OBJECT (window); @@ -1989,7 +1989,7 @@ _gdk_directfb_calc_abs (GdkWindow *window) impl->abs_y += parent_impl->abs_y; } - D_DEBUG_AT( GDKDFB_Window, "%s( %p ) -> %4d,%4d\n", __FUNCTION__, window, impl->abs_x, impl->abs_y ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p ) -> %4d,%4d\n", G_STRFUNC, window, impl->abs_x, impl->abs_y ); for (list = private->children; list; list = list->next) { @@ -2503,7 +2503,7 @@ gdk_window_set_functions (GdkWindow *window, return; /* N/A */ - g_message("unimplemented %s", __FUNCTION__); + g_message("unimplemented %s", G_STRFUNC); } static gboolean @@ -2516,7 +2516,7 @@ gdk_directfb_window_set_static_gravities (GdkWindow *window, return FALSE; /* N/A */ - g_message("unimplemented %s", __FUNCTION__); + g_message("unimplemented %s", G_STRFUNC); return FALSE; } @@ -2534,7 +2534,7 @@ gdk_window_begin_resize_drag (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; - g_message("unimplemented %s", __FUNCTION__); + g_message("unimplemented %s", G_STRFUNC); } void @@ -2549,7 +2549,7 @@ gdk_window_begin_move_drag (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; - g_message("unimplemented %s", __FUNCTION__); + g_message("unimplemented %s", G_STRFUNC); } /** @@ -2864,7 +2864,7 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable, if (!region) return; - D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %4d,%4d-%4d,%4d (%ld boxes)\n", __FUNCTION__, + D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %4d,%4d-%4d,%4d (%ld boxes)\n", G_STRFUNC, paintable, GDKDFB_RECTANGLE_VALS_FROM_BOX(®ion->extents), region->numRects ); /* When it's buffered... */ @@ -2927,7 +2927,7 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable) impl = GDK_DRAWABLE_IMPL_DIRECTFB (paintable); - D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, paintable ); + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, paintable ); g_return_if_fail (impl->paint_depth > 0); -- 2.30.2